CGAL_6.1_compatibility

===================================================================

Gbp-Pq: Name CGAL_6.1_compatibility.diff

diff --git a/src/CSGCGALDomain3D.cpp b/src/CSGCGALDomain3D.cpp
index 5f1790fc64bdbe9808b31a2cd595de2187dd9e56..9685ede41eb665df972f785bacf5bc716148b444 100644 (file)
--- a/src/CSGCGALDomain3D.cpp
+++ b/src/CSGCGALDomain3D.cpp
@@ -54,7 +54,7 @@
 #include <CGAL/Polygon_mesh_processing/self_intersections.h>
 
 #include <CGAL/AABB_tree.h>
-#include <CGAL/AABB_traits.h>
+#include <CGAL/AABB_traits_3.h>
 #include <CGAL/boost/graph/graph_traits_Polyhedron_3.h>
 #include <CGAL/AABB_face_graph_triangle_primitive.h>
 
@@ -91,7 +91,7 @@ namespace
 
 // AABB tree primitives
   typedef CGAL::AABB_face_graph_triangle_primitive<Exact_Polyhedron_3> Primitive;
-  typedef CGAL::AABB_traits<Exact_Kernel, Primitive> Traits;
+  typedef CGAL::AABB_traits_3<Exact_Kernel, Primitive> Traits;
   typedef CGAL::AABB_tree<Traits> AABB_Tree;
 }
 

diff --git a/src/make_multicomponent_mesh_3.h b/src/make_multicomponent_mesh_3.h
index e0fc46450ff295a3ce26c184716f4f19e75d0785..e0d96a14e8aefe5d762820514e96d108b7ab3f4d 100644 (file)
--- a/src/make_multicomponent_mesh_3.h
+++ b/src/make_multicomponent_mesh_3.h
@@ -50,7 +50,7 @@ void make_multicomponent_mesh_3_impl(C3T3& c3t3,
   // std::cout << "Number of vertices after features: " << c3t3.triangulation().number_of_vertices() << std::endl;
   
   // Inserts points from all connected components to the mesh
-  CGAL::Mesh_3::internal::init_c3t3(c3t3, domain, criteria, 0);
+  CGAL::Mesh_3::internal::init_c3t3(c3t3, domain, criteria, 0, CGAL::parameters::internal::Initialization_options<MeshDomain, C3T3>());
   // std::cout << "Number of vertices before meshing: " << c3t3.triangulation().number_of_vertices() << std::endl;
   
   // Build mesher and launch refinement process